Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 10 pull requests #54790

Closed
wants to merge 28 commits into from
Closed

Rollup of 10 pull requests #54790

wants to merge 28 commits into from

Conversation

kennytm
Copy link
Member

@kennytm kennytm commented Oct 3, 2018

Successful merges:

Failed merges:

r? @ghost

phungleson and others added 28 commits September 5, 2018 00:03
If the rust-enabled lldb was built, then use it when running the
debuginfo tests.  Updating the lldb submodule was necessary as this
needed a way to differentiate the rust-enabled lldb, so I added a line
to the --version output.

This adds compiletest commands to differentiate between the
rust-enabled and non-rust-enabled lldb, as is already done for gdb.  A
new "rust-lldb" header directive is also added, but not used in this
patch; I plan to use it in rust-lang#54004.

This updates all the tests.
I noticed a small typo while reading over this document.
In  rust-lang#51833, I improved the performance of `copy_undef_mask()`. As such, the old FIXME wasn't appropriate anymore. The main remaining thing left to do is to implement a fast path for non-overlapping copies (per @oli-obk).
…ror, r=GuillaumeGomez

Add doc for impl From for Std Error

As part of issue rust-lang#51430 (cc @skade).

I am not sure if it is going to a correct direction so put up here so that people can comment.
Add checking for tool distribution in Tier 1

This fixes rust-lang#54483
r? @kennytm
…idtwco

[NFC] `getopts` is used by `librustc` and `librustc_driver`, but isn't declared in their `Cargo.toml`.
Cleanup rustc/ty part 2

The second part of cleanups and minor improvements for rustc/ty.
- improve allocations
- calculate span after a possible early continue
- simplify some patterns
- mark a comment as FIXME
- whitespace fixes

The PR is independent from from the first part.
Make spec_extend use for_each()

`for_each` will use an iterator's own implementation of `try_fold`, which I understand to be generally preferable (because nested iterator adapter's will use each other's `try_fold` and be designed for the specific adaptation in a way that promotes performance and inlining.
Run debuginfo tests against rust-enabled lldb, when possible

If the rust-enabled lldb was built, then use it when running the
debuginfo tests.  Updating the lldb submodule was necessary as this
needed a way to differentiate the rust-enabled lldb, so I added a line
to the --version output.

This adds compiletest commands to differentiate between the
rust-enabled and non-rust-enabled lldb, as is already done for gdb.  A
new "rust-lldb" header directive is also added, but not used in this
patch; I plan to use it in rust-lang#54004.

This updates all the tests.
Fix typo in CONTRIBUTING.md

I noticed a small typo while reading over this document.
…i-obk

Update a FIXME in memory.rs

In  rust-lang#51833, I improved the performance of `copy_undef_mask()`. As such, the old FIXME wasn't appropriate anymore. The main remaining thing left to do is to implement a fast path for non-overlapping copies (per @oli-obk).

r? @oli-obk
A handful of cleanups for rustc/mir

- use the "regular" `into()` instead of `graphviz::IntoCow` in `mod.rs`
- `format!("{}", x)` > `x.to_string()`
- remove one unnecessary `String` allocation
- shorten the logic of one loop
- `assert!(x == y)` > `assert_eq!(x, y)`
- whitespace & formatting fixes

r? @oli-obk
@kennytm
Copy link
Member Author

kennytm commented Oct 3, 2018

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Oct 3, 2018

📌 Commit 94508ca has been approved by kennytm

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 3, 2018
@bors
Copy link
Contributor

bors commented Oct 3, 2018

⌛ Testing commit 94508ca with merge c629af2bff8abd6b2e58e7fdba25a894de207288...

@bors
Copy link
Contributor

bors commented Oct 3, 2018

💔 Test failed - status-travis

@rust-highfive
Copy link
Collaborator

The job dist-various-1 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
[00:07:34] [RUSTC-TIMING] syntax test:false 61.913
[00:07:34]    Compiling proc_macro v0.0.0 (/checkout/src/libproc_macro)
[00:07:42] [RUSTC-TIMING] proc_macro test:false 8.134
[00:07:42]    Compiling syntax_ext v0.0.0 (/checkout/src/libsyntax_ext)
[00:07:42] error[E0523]: found two different crates with name `getopts` that are not distinguished by differing `-C metadata`. This will result in symbol conflicts between the two.
[00:07:42]     |
[00:07:42] 119 | extern crate test;
[00:07:42]     | ^^^^^^^^^^^^^^^^^^
[00:07:42] 
---
[00:07:58] [RUSTC-TIMING] syntax_ext test:false 15.992
[00:07:58] error: build failed
[00:07:58] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--features" " jemalloc" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json"
[00:07:58] expected success, got: exit code: 101
[00:07:58] thread 'main' panicked at 'cargo must succeed', bootstrap/compile.rs:1112:9
[00:07:58] travis_fold:end:stage0-rustc

[00:07:58] travis_time:end:stage0-rustc:start=1538585624347499190,finish=1538585762699240976,duration=138351741786

---
travis_time:end:0b3a71a6:start=1538585763397753282,finish=1538585763407501091,duration=9747809
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:2d41eef0
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0659d2d0
$ cat ./obj/build/x86_64-unknown-lin

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 3, 2018
@kennytm kennytm closed this Oct 3, 2018
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.